Bug 485220: [Architecture] Provide a more modular architecture

https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220

Factor UI dependencies out of the UML Element Types bundle.  This includes
moving some advices that interact with the user into a new
org.eclipse.papyrus.uml.service.types.ui bundle.

Pull up the PasteCommandService and IPasteCommandProvider API into the
Infra Diagram layer where the extension point is defined.  Deprecate the
old API in the UML layer.

Introduce a service for participation of languages in CSS styling:

* styling reset actions in the Reset Style command
* access to semantic model classes and properties to make available to CSS

Factor PapyrusObservableValue and cohorts out of the UML Tools bundle
into the Infra Layer for more general reuse and to relieve the
Diagram Infrastructure layer of UML dependencies.  The old API remains as
deprecated.

Remove the Infra Diagram Layer dependency on UML Layer for property
testers governing deletion in the diagram.  Includes introduction of
a new IGraphicalDeletionHelper OSGi service for delegation of the
determination of whether an element can be deleted from the diagram and
replacement of the XML expression properties

* org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion
* org.eclipse.papyrus.uml.diagram.common.isReadOnly

by

* org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion
* org.eclipse.papyrus.infra.gmfdiag.common.canDelete

(where the latter is the negation of the property that it supersedes)

Extract UML dependencies from the Diagram Outline and CSS Editor bundles.

Remove unused MDTUtil APIs that referenced a UML-specific annotation.

Move the Diagram Infrastructure CSS Palette bundle into the UML layer because it
serves to provide extensions on the Palette Service, which is an overtly
UML-specific capability.

All client APIs for the Properties View are moved from
org.eclipse.papyrus.views.properties bundle to a new
org.eclipse.papyrus.infra.properties.ui bundle.  This
includes renaming of:

* extension points
* label-provider contexts
* XWT namespaces

Add an "all UI tests" suite.

Define a componentized hierarchical build layout of the main plug-ins

Change-Id: I43f8f3644857a18b69715f5a2f1da9b1cf286d67

349 files changed, 11576 insertions, 12224 deletions

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/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.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/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/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-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/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/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/build.properties
deleted file mode 100644
index 12082314b29..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.xml,\

-               icon/

-src.includes = about.html

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/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/Activator.java
deleted file mode 100644
index 17153b166a2..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/Activator.java
+++ /dev/null
@@ -1,69 +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;

-

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

-	}

-

-}

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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/icons/obj16/Plus.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/icons/obj16/Plus.gif
new file mode 100644
index 00000000000..252d7ebcb8c
--- /dev/null
+++ 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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/helper/EditorHyperLinkHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/helper/EditorHyperLinkHelper.java
new file mode 100644
index 00000000000..4208d7d2837
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/helper/EditorHyperLinkHelper.java
@@ -0,0 +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.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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/object/HyperLinkEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/object/HyperLinkEditor.java
new file mode 100644
index 00000000000..c0f94624ae4
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/object/HyperLinkEditor.java
@@ -0,0 +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.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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorHyperLinkEditorShell.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorHyperLinkEditorShell.java
new file mode 100644
index 00000000000..15ee47a6b54
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorHyperLinkEditorShell.java
@@ -0,0 +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.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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorLookForEditorShell.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorLookForEditorShell.java
new file mode 100644
index 00000000000..e77b706ce2e
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorLookForEditorShell.java
@@ -0,0 +1,431 @@
+/*****************************************************************************
+ * 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) - bug 410346
+ *  Christian W. Damus (CEA) - bug 431397
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IDisposable;
+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.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.commands.CreationCommandDescriptor;
+import org.eclipse.papyrus.commands.CreationCommandRegistry;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.commands.ICreationCommandRegistry;
+import org.eclipse.papyrus.infra.core.extension.NotFoundException;
+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.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;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFGraphicalContentProvider;
+import org.eclipse.papyrus.infra.ui.emf.providers.strategy.ContainmentBrowseStrategy;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.providers.IGraphicalContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+
+//TODO: Refactor. Remove the diagram creation listener, and use a Dialog (Which is blocker) instead of a Shell
+public class EditorLookForEditorShell extends AbstractLookForEditorShell {
+
+	/** The adapter factory. */
+	protected AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+	/** The selected diagram. */
+	protected Object selectedEditor;
+
+	/**
+	 * Gets the selected editor.
+	 *
+	 * @return the selectedEditor
+	 */
+	protected Object getSelectedEditor() {
+		return selectedEditor;
+	}
+
+	/**
+	 * Sets the selected editor
+	 *
+	 * @param selectedEditor
+	 *            the selectedEditor to set
+	 */
+	protected void setSelectedEditor(Object selectedEditor) {
+		this.selectedEditor = selectedEditor;
+	}
+
+	/** The model. */
+	protected EObject model;
+
+	/** The diagram menu button. */
+	protected Menu diagramMenuButton;
+
+	/** The diagram list tree viewer. */
+	protected TreeViewer diagramListTreeViewer;
+
+	/** The tree viewer. */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * The listener interface for receiving diagramCreate events. The class that
+	 * is interested in processing a diagramCreate event implements this
+	 * interface, and the object created with that class is registered with a
+	 * component using the component's <code>addDiagramCreateListener<code> method. When
+	 * the diagramCreate event occurs, that object's appropriate
+	 * method is invoked.
+	 *
+	 * @see DiagramCreateEvent
+	 */
+	public class DiagramCreateListener extends SelectionAdapter {
+
+		/** The command descriptor. */
+		private final CreationCommandDescriptor commandDescriptor;
+
+		/** The container. */
+		private EObject container;
+
+		/** The i creation command registry. */
+		private final ICreationCommandRegistry iCreationCommandRegistry;
+
+		/**
+		 * {@inheritedDoc}.
+		 *
+		 * @param e
+		 *            the e
+		 */
+		@Override
+		public void widgetSelected(SelectionEvent e) {
+			try {
+				if (treeViewer.getSelection().isEmpty()) {
+					return;
+				}
+
+				IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+
+				EObject elt = EMFHelper.getEObject(selection.getFirstElement());
+				if (elt == null) {
+					return;
+				}
+
+				setContainer(elt);
+				ModelSet modelSet = ServiceUtilsForEObject.getInstance().getModelSet(elt);
+
+				ICreationCommand creationCommand = iCreationCommandRegistry.getCommand(commandDescriptor.getCommandId());
+				creationCommand.createDiagram(modelSet, container, null);
+
+				// refresh several filtered tree
+				getDiagramfilteredTree().getViewer().refresh();
+				getModeFilteredTree().getViewer().refresh();
+			} catch (NotFoundException ex) {
+				Activator.log.error(ex);
+			} catch (ServiceException ex) {
+				Activator.log.error(ex);
+			}
+		}
+
+		/**
+		 * Instantiates a new diagram create listener.
+		 *
+		 * @param commandDescriptor
+		 *            the command descriptor
+		 * @param backboneContext
+		 *            the backbone context
+		 * @param container
+		 *            the container
+		 * @param iCreationCommandRegistry
+		 *            the i creation command registry
+		 */
+		public DiagramCreateListener(CreationCommandDescriptor commandDescriptor, EObject container, ICreationCommandRegistry iCreationCommandRegistry) {
+			super();
+			this.commandDescriptor = commandDescriptor;
+			this.container = container;
+			this.iCreationCommandRegistry = iCreationCommandRegistry;
+		}
+
+		/**
+		 * Sets the container.
+		 *
+		 * @param container
+		 *            the new container
+		 */
+		public void setContainer(EObject container) {
+			this.container = container;
+		}
+	}
+
+
+
+
+	/**
+	 * Instantiates a new editor look for diagram.
+	 *
+	 * @param editorFactoryRegistry
+	 *            the editor factory registry
+	 * @param amodel
+	 *            the amodel
+	 */
+	public EditorLookForEditorShell(IPageIconsRegistry editorFactoryRegistry, EObject amodel) {
+		super();
+		this.model = amodel;
+		// create the shell
+		createLookforShell();
+
+		// intall tree with uml element
+		treeViewer = getModeFilteredTree().getViewer();
+		treeViewer.setUseHashlookup(true);
+		// treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory) {
+		//
+		// @Override
+		// public Image getImage(Object object) {
+		// //TODO
+		// // if(object instanceof PapyrusTableInstance) {
+		// // return editorRegistry.getEditorIcon((object));
+		// // } else {
+		// // return super.getImage(object);
+		// // }
+		// Image im = super.getImage(object);
+		// return im;
+		// // return null;
+		// }
+		// });
+
+		ILabelProvider labelProvider;
+		ServicesRegistry registry = null;
+
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(model);
+			labelProvider = registry.getService(LabelProviderService.class).getLabelProvider();
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			labelProvider = new LabelProvider();
+		}
+
+		treeViewer.setLabelProvider(labelProvider);
+		// treeViewer.setContentProvider(new
+		// CustomAdapterFactoryContentProvider(adapterFactory));
+		// treeViewer.setContentProvider(new
+		// SemanticEMFContentProvider(amodel)); //This content provider will
+		// only display the selected element, instead of the root element
+		// FIXME: Use a standard, non-deprecated content
+		IHierarchicContentProvider semanticProvider = new TreeViewContentProvider(new EObject[] { EcoreUtil.getRootContainer(amodel) });
+		ContainmentBrowseStrategy strategy = new ContainmentBrowseStrategy(semanticProvider);
+		IGraphicalContentProvider graphicalContentProvider = new EMFGraphicalContentProvider(strategy, model.eResource().getResourceSet(), Activator.PLUGIN_ID + ".editorTreeView");
+		treeViewer.setContentProvider(graphicalContentProvider);
+		// treeViewer.setInput(model.eResource());
+		treeViewer.setInput(registry);
+		graphicalContentProvider.createAfter(getAfterTreeViewComposite());
+		this.setChildrenBackground(getAfterTreeViewComposite(), Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+
+		// install diagramlist
+		diagramListTreeViewer = getDiagramfilteredTree().getViewer();
+		diagramListTreeViewer.setUseHashlookup(true);
+
+		// fill list of diagram
+		// TODO
+		// diagramListTreeViewer.setLabelProvider(new ObjectLabelProvider(null));
+
+		// we can't reuse the same instance of the label provider see bug 385599: [Hyperlink] We can't select the diagram/table for referencing them
+		diagramListTreeViewer.setLabelProvider(labelProvider);
+
+
+		diagramListTreeViewer.setContentProvider(new EditorListContentProvider(model));
+		diagramListTreeViewer.setInput(""); //$NON-NLS-1$
+
+		// add listner on the new button to display menu for each diagram
+		diagramMenuButton = new Menu(getNewDiagrambutton());
+		getNewDiagrambutton().setMenu(diagramMenuButton);
+		CreationCommandRegistry commandRegistry = CreationCommandRegistry.getInstance(org.eclipse.papyrus.infra.ui.Activator.PLUGIN_ID);
+		for (CreationCommandDescriptor desc : commandRegistry.getCommandDescriptors()) {
+			MenuItem menuItem = new MenuItem(diagramMenuButton, SWT.PUSH);
+			menuItem.addSelectionListener(new DiagramCreateListener(desc, null, commandRegistry));
+			menuItem.setText(desc.getLabel());
+		}
+		getNewDiagrambutton().addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
+				diagramMenuButton.setVisible(true);
+			}
+		});
+
+		// add listener to remove diagram
+		getRemoveDiagrambutton().addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
+				IStructuredSelection iSelection = (IStructuredSelection) getModeFilteredTree().getViewer().getSelection();
+				Iterator<?> iterator = iSelection.iterator();
+
+				final IPageManager pageManager;
+				try {
+					pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, model);
+				} catch (ServiceException ex) {
+					Activator.log.error(ex);
+					return;
+				}
+
+				final List<Object> pagesToDelete = new LinkedList<Object>();
+				while (iterator.hasNext()) {
+					EObject selectedElement = EMFHelper.getEObject(iterator.next());
+					if (pageManager.allPages().contains(selectedElement)) {
+						pagesToDelete.add(selectedElement);
+					}
+				}
+
+				if (pagesToDelete.isEmpty()) {
+					return;
+				}
+
+				for (Object page : pagesToDelete) {
+					pageManager.closeAllOpenedPages(page);
+				}
+
+				// getDiagramfilteredTree().getViewer().setInput(""); //$NON-NLS-1$
+				getModeFilteredTree().getViewer().refresh();
+			}
+		});
+
+		// add listener to keep the selected diagram in the list for the model
+		// view
+		getModeFilteredTree().getViewer().addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent event) {
+				Object selection = ((IStructuredSelection) getModeFilteredTree().getViewer().getSelection()).getFirstElement();
+				refresh(selection);
+			}
+		});
+
+		// add listener to keep in mind the selected diagram in the list for the
+		// view of digram list
+		getDiagramfilteredTree().getViewer().addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent event) {
+				Object selection = ((IStructuredSelection) getDiagramfilteredTree().getViewer().getSelection()).getFirstElement();
+				refresh(selection);
+			}
+		});
+
+		// add listener for the button ok, keep the selected diagram
+		getOKbutton().addSelectionListener(new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				if (treeViewer.getContentProvider() instanceof ICommitListener) {
+					((ICommitListener) treeViewer.getContentProvider()).commit(null);
+				}
+				getLookforShell().close();
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+
+		// add listener for the button cancel, remove the value of the selected
+		// diagram
+		getCancelbutton().addSelectionListener(new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				setSelectedEditor(null);
+				getLookforShell().close();
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+
+		// dispose the adapter factory when the shell is closed
+		getLookforShell().addDisposeListener(new DisposeListener() {
+
+			public void widgetDisposed(DisposeEvent e) {
+				// we created the adapter factory, so we should dispose it
+				if (adapterFactory instanceof IDisposable) {
+					((IDisposable) adapterFactory).dispose();
+				}
+			}
+		});
+
+	}
+
+	/**
+	 * Open the shell
+	 */
+	public void open() {
+		Display display = Display.getCurrent();
+		getLookforShell().pack();
+		// getLookforShell().setSize(700, 500);
+
+		// code use to wait for an action from the user
+		getLookforShell().pack();
+		// getLookforShell().setBounds(500, 500, 500, 300);
+		getLookforShell().open();
+		while (!getLookforShell().isDisposed()) {
+			if (!display.readAndDispatch()) {
+				display.sleep();
+			}
+		}
+	}
+
+	protected void refresh(Object selectedElement) {
+		selectedElement = EMFHelper.getEObject(selectedElement);
+		Button but = getOKbutton();
+		if (isAValidEditor(selectedElement)) {
+			but = getOKbutton();
+			but.setEnabled(true);
+			selectedEditor = selectedElement;
+		} else {
+			but.setEnabled(false);
+			selectedEditor = null;
+		}
+	}
+
+	protected boolean isAValidEditor(final Object object) {
+		if (!(object instanceof EObject)) {
+			return false;
+		}
+
+		EObject eObject = (EObject) object;
+
+		try {
+			return ServiceUtilsForEObject.getInstance().getService(IPageManager.class, eObject).allPages().contains(object);
+		} catch (ServiceException ex) {
+			return false;
+		}
+	}
+
+}
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>